bitkeeper revision 1.1714 (42aa3a9a496MHCAuDASFOLRgBsKcZQ)

[PATCH] [PATCH] vmx-device-models-py.patch

Start device models for VMX domains. I'm not sure why the event channel port number is off by 1.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 16415d78a7c77f470723d5a800cc17d9dc0f2abc..5baa306195cccc42d50f9ee65e355dfae7cd41ba 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -701,6 +701,7 @@ class XendDomainInfo:
                 ctrl.initController(reboot=True)
         else:
             self.create_configured_devices()
+        self.image.createDeviceModel()
 
     def device_create(self, dev_config):
         """Create a new device.

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index e0d70581bf5f09b3a93a6088c0bdc085209f5574..deb77b066ce9f73875cdfd019954468ad4e025cb 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -1,4 +1,4 @@
-import os
+import os, string
 
 import xen.lowlevel.xc; xc = xen.lowlevel.xc.new()
 from xen.xend import sxp
@@ -6,6 +6,8 @@ from xen.xend.XendError import VmError
 from xen.xend.XendLogging import log
 from xen.xend.xenstore import DBVar
 
+from xen.xend.server import channel
+
 class ImageHandler:
     """Abstract base class for image handlers.
 
@@ -303,7 +305,7 @@ class VmxImageHandler(ImageHandler):
                   + " -f %s" % device_config
                   + self.vncParams()
                   + " -d %d" % self.vm.getDomain()
-                  + " -p %d" % self.device_channel['port1']
+                  + " -p %d" % (int(self.device_channel.port1)-1)
                   + " -m %s" % self.vm.memory)
 
     def vncParams(self):